Added support for tuple3s and maps