Allow the catalog to be generated on device properties as well