Added tabulation and kana forms