Added support for UDP connections