Added functionality to link unmarshalled granularities to statically defined granularity enumerations
Refactorizations