Add 'serviceId' param to init