Adding plug-in mechanism to add constraints dynamically (work in progress)
Minors fixes