Better plug-ins management