Align with latest plugin version