Refactored RichWPS Provider.