### FIxed - Fixed a bug where the context got mixed up in the registrar being singleton.
Added a few types and few fixes to make it all work together.