Add tuple support