Changes to db context and data access