Add a Layer between Enums and Factories

[boardengineer]

The objects stores as values in the factories map should be easily extendable, to accomplish this the should a factories container to replace the enum and the enum will map to such a container