As before, should be done within plugin manager