Update to GEM validation code