[WIP] : Refactoring the plugin form extension