Changes to gen-db