[DSL] WIP > Added generated & customized queries II