Handle membership update properly