Make the id property available on both modules and descriptors, and make it a property, so that we aren't duplicating the location data