Fix class Database