further improvements to the data access layer