Allow service type to be customized

Change-Id: Ia442ec02b8fdaa4110661e7592452544cff1fb94