+ Added factory for entities
+ Added some constructors