Added support for tuple returns