[WIP] : Refactoring the plugin form extension

[WIP] : Refactoring the plugin form extension