Revert "Revert "cfa members map""

This reverts commit 60087cfaac05640c6557233fdf37431c07681d35.