Improving plugin