Revert to predefined map for now