More work on Geonetwork class.