Final version of the GWAP for Cubrik Integration