Added entity factory and object