Added window and math classes