Using fluent queries for builds. Fixes issue #4