Ensured original database fields are retained