Revamp of Plugin module