Added more window objects