Add using appropriate data structure for user_wait_list