Minor refactoring of DataAccess