Fixed remap schema