Added capability and version check