Refactor PersistentResourceDefinition.java to automatically handle children
Unify parsing / persisting