Add language pragma
Small fixes
DSL design