Add tuple and char support.