Added multiplexer/demultiplexers, plus more functionalities