Improving Generic Window Handler.