Changed Class Param Additions, and Added Support for Hyphenated Classes