Improves #3 Support class names containing "_"