Expose mux
Match can not be used to match any Mux for better extensibility outside the library default
Format + update comment