Fix issue #9 and restor SQL DSL