Benchmarks update and some refactoring
Start improving DSL