Added functions and removed DSL.