Add strictness flags to data strucutres