Fixed error in table names
Changed the primary keys to ints