Added Statement class
Switch from 'Statement' to 'QueryComponent'
Added Union support