Changed the EntityFactory class into a static class since I think that makes more sense.