Added location granularity