Add option to override default port