Converted map to tuple constructs to enforce names and types