Add some minor modifications. On way to more modular.