Adds support for tags used by windows