Upgrade to rafflev1