Modified window context creation