Updated to use string for minirivet parsing