adopted to latest plugin infrastructure