Feature/use tcp endpoint