Add support for returning tuple