Added mapping for tabing windows