Update to match refactor