Added classes Window and Widget