Changed to reflect the refactor.