Changed PersistenceManager and entities to manage non editable fields properly