Clean up context work, add features for domains and members