Added support for remote connection