SES-1726 : Parser working for tuples
SES-1726 : Cleanup parser