Updates to help remove the need for dicts.