Continuted work on plugins