Adding support of multiple service hosts