Make outline more modular.