Match spec to new writer DSL