Added autoloding support for classes containing underscores