Work adding custom contexts and fixing unstructured events

Thanks for your feedback!
You can remove `name` now as no longer used