Refactored webhooks a bit