Added user and userlist class