I'd prefer for this to be non-optional if we use this format, so that it's explicit for users.