Working on plugin more