Adds missing references to thunder basics
Merge branch 'fix/umbrella-imports' into develop

* fix/umbrella-imports:
  Adds missing references to thunder basics