Refactored to match refactored API