Updated Granularity/Unit related fields and methods.