allow more complex expressions in extract clause
allow more complex expressions in extract clause
added cross join syntax support