Add possibility to specifiy port number