Add tuple length check