Put more functionality into mapper.
Add delete method to QueryGenerator.