Upgraded tc-client