Made DSL more consistent, added features