Added dynamic lookup of default window identifier