Fixing doubled up spec, capabilities vs features