Refine the query builder API
Add Eclipse formatter for contributors