Change port number to be optional