Added constraint checking using axiom-types
Merge branch 'dash-with-axiom-types' into extended