Checking for port number and added DEFAULT_ prefix