ServiceInterface restructure