These should be made optional. Otherwise, we'll need to include them in any projection we do and it makes the format harder to evolve.