Fixing up game element factories
Fixing up game element factories 2.0