Resolved ERRAI-527: No longer depend on Alpha's for WS