Allow j5 port to be passed in and fix reference to payload data