Modify Plugin to meet our needs

@remedina18
I think your answer is in today’s Tadabase update.