Improve Membership validation.