Moved from tuple to simple class