refactor value definitions.
refactor enum name.
Changed Charset type to sisioh's type