Integrate more pieces from old setup.