Added proper support for tuples