Little bit of refactoring and added ability to get plugin name using isolate arguments.