Updated to latest ServiceInterface