Enhance plugin with more features (draft)