Updated to support JSKK v1.1.