Refactoring and changes to how the database are handled.