Added base DB support