Make Memberships more consistent