Added support for custome port as well