Changes:

A query-builder was added