Service definition related changes