Probably, but I don't think it's worth changing unless we need to change any of these fields.