GEMS Enhancements

GEMS Enhancements