Added addition and removal of users