added extra stuff for DB