added joins to get columns with names