Working on plugin implementation