fix for language argument and add language class.