Added TCP and UDP echo server support