More structuration
Should work as a standalone plugin