Removed todo item
Fixing persistence issues with composite objects