reconfigured database classes
use new database class