Added support for DB schemas