Added 'return' type support