Updated with latest plugin