Updates for refactor.