Refactoring mapping
Add taglist
Refactoring