Abstracting class name
Merge branch 'hub' into develop
Merge branch 'develop'