Add Events support