Changes required by GeometryDB_cff