Improved capability check