Database refactoring

ID: database-refactoring

New to topics? Read the docs here!