Refactored WLS Protocol