Again, this is generated code, so let us not touch them since spec is still going through change