Plugin revamp