Implementing changes to the database classes