Modified DataBase files to comply with new class diagram