Tweaking imports and exports for the service interface in regards to waiters