Refactored Capability properties