Adding TCP support