Support for tuples and option types