Add support for customDB