To be implemented for the 2.0 version
New features for release 1.4.x
To be fixed before release 1.3.0