Add support for lists of tuples