Now tags can be added
Refactoring code