added name and type to tunnel implementation
removed class dependency to ds