Update to reflect refactoring