MapTransform: Keep both implementations for now