Added new target to build-script to generate sources. Added multiple new queries