Make the EngineBuilder interface more consistent