Move dicts out of class variables