Changes for the class-level fields comparison