Modified database class