Refactoring and database features