Removing unordered maps for compatability.