Add dbtype check
merge