Changed the way Join and Where objects are added to the build array
Each new Join or Where is stored as a seperate object in the corresponding build array index