Database rework