Parser now fixed. Also did basic level of extraction for join conditions