Add addLocation and applyServiceTemplate