Refactoring workspace tag