Abstracting class name
Merge branch 'hub' into develop