Moved Object creation to Factory