Add inner word mapping and update pattern
Improve