Add basic Mux support (still need to cleanup possible 'type decorations' on NS though, probably)