Added minor changes to plugin