GDA CORE - Fix UnsupportedMethodException