Needed to add special class loading, too