Added support for DB commands and statements