Fork for Core Plugin