Added support for schema name