Add users check to basePlugin
Add user handling