Feature/wait member list