Bugs relatedto persisting structure fixed (objects and services)