Add support for multiple types db