Remove jdk7 requirement
Remove jdk7 requirement
Add more Ops to be more SQL like