Added new methods to window/application and renamed some methods