Small refactoring.
Add configuration DSL and specs