Refactoring for object tags preservation