Added not implemented Update method
Implemented return of created objects
Cleanup of merging