Mayor refactoring

Implemented ValueCreator to build up special values directly from QueryBuilder
Merge remote-tracking branch 'origin/master'