[PD] Improve the Malinette Framework