adopted latest plugin infrastructur