Fixing record type to use a list of tuples