Updated Tag and Create tools