Work adding custom contexts and fixing unstructured events

Thanks for your feedback!