Refactored and repaired UserRecords