MakeTuple methods refactored