Fixed up WSInterface