Added new include files for DB management