Updated to use code we can now generate from the MIBs