Added a Query builder class that builds all queries.
also added test for "addAnnotations".