[FIX] warning: [rawtypes] found raw type: Class
Merge branch 'with_rawtype_fix'

merge in rawtype fix