Changes for Nested class/enum type comparisons