add service handling