Adding table joins to get columns from other tables