Minor fixes
Added class support