Updated joins to use the table name as defined in the DbTable class.