Rework to try to get generation working from MapTransformer