Continue the factory to reduce code an support new features with a minimum effort