UUID support

Updated for GP version 9.0