Add (untested) primitive capability query support