Tags creator tool added, refactoring