Fix adding data to Custom Events