Updated to include new files and database changes