Added granularity for number fields