Replaced dictionary with namedtuple