Implemented changes in PersistentObject and other Metadata objects; need to double check if all works OK.