Moved dictionary to a class.