WCM-188 Return serviceContext to keep track of the service
WCM-188 Remove import-packages
WCM-188 Fix tools