Changed database class