Better builder for the engine