Refactored ActiveDataProvider.