Removed tuples, work on named tuples