Re-applied changes to the updated version of snowplow