Added extra capability detection