Simplify capabilities
Add upgrade method for deprecated capabilities