20180911 city.delhi: Separate unit to ensure there are no delays