Started working on plugin implementation