Made Chaos more modular.