Fix/bake plugin ns