Feature/plugin extraction