Updated to support SpringRoll