Allow the catalog to be generated on device properties as well

You don't really need these 2 extra blank lines.