Improved model of supported plugins
Improved further file parsing