Adding BSD & TCP support