Performance improvement, Location updation module fixed and integrated
completely.