Using an ordered dict for custom name order