Updated window+ context creation