Change no-function classes to namedtuples