Updated for latest generator/receiver changes.