Added id to User class