Add service handling