add class
Merge branch 'hotfix/hotfixfea'