Remove plugin name dependency, updated plugin parsing