Adding support for database component