properly define tuple types and restructure section