Adopt to changes in User class