Added option to specify port