Updated to reflect refactoring