NoSQL DSL experiment:

- Minor refactorings