These shouldn't be dicts, make them named tuples or something like that.