Surabaya integration & SitTarget Workaround