Added generics to factory classes, improve type-safety.
Entity based creators now use String literals.