Updated to the latest versions of code generator and specs