Refactored to 2.0 API