Restructure the capabilities and override aspects