Patched geomodel for ndb and added handlers