Fix generators dependencies and plugins
Fix template dependencies