Added support for MPL2 format