Refactor and porting of service explorer code.