Improve opener plugin