Fixed core file inclusions and class initializations