Pushed more basic operations into the factory.