Add improved membership
Fix references