Continuing work on plugin