Updated class Database