Minor - format code.
Adding ClassId support when importing users see #6680
Adding id when exporting classes see #6680