Fixed missing classes issues