Add Service factory and client