Added window and frame objects