Moved all table names to constants