Codechanges inside class.database. Rename and add some methods.