Adding ObjectFactory