Tags creator tools added, refactoring