Improvements for PersistenceLayer DAO