Added check if service exists