fix TODO comment
add support for Tuple as a parameter, add support for extracting fields
by index