Database class model updated