adopted latest plugin infra