Added Watershare common classes