Add support for custom port/user/pass