refactored content database