Made the system modular.