Updated DatabaseHandler and getter for Data-classes