New user plugin to support new P2 versions