1. Adjustment of code to work with multiple raw_joins
2. Test multiple raw joins