Use named tuple instead of a dict. One more is still there and needs to be replaced