CDB-4165 Added field to User model, and decorator