refactored databases