Fixed issue with nonexistent classes.
Basic changes