Changes to user class