Remove named tuple and used plain lists with plain tuple