add better support for distributed databases