Refactory mux entries