Chenged the plugins implementation strategy