Replaced DSL by json based format