Updated sample to utilize newer "gateway" format.