Adding multiplex-common dep and locking for now