Replaced strange characters.
Updated classes