Improvements of plugins management