Moved WSC to lib