WAMSProvider refactoring.