Change how I include files
Update table structure