Annotated version of draft DSL