modified classes for DB changes