Changed Id column and join column name