Added missing classes from src for webclient