changed plugin structure