implementation markup for demo app
Polishing dsl library