Skip Component builder for completion

Improves overall completion