Added constraints
Uniformisation of XMLPI API
Allowed formatting without indenting