Removed ValToe.
Added missing classes.