Made things more modular.