Fixed missing classes from sutro