Updated type mapping for some values in ClassesBuilder (rearranged them according to documentation)