added joins parsing