Don't use FACTORY_FOR when not needed