Add support for multiple databases