Adding support for non string granularities