Switching from HashMap (unordered) to Map (ordered) to give more stability to generated fields