Adjust to changes in User class. Aggregate constants now must explicitly