Multi-window support added
Class shifted