Modified DSL; updated specs