Added Siteloc logic