[UPDATE] Add user list