Changing the data model for webhooks to not duplicate token