Added membership, and refactored with inherited_resources.