Add window tagging feature