Refactored DB field