Added CommonCode for enums