Change: dump improved
New: Treating constraints