Overhaul of user membership model