Add window related features