Following changes in GEOMTK