Made changes due to PersistenceService interface changes