some refactoring in granularity-lite