added base types
Merge branch 'feature/types' into develop

* feature/types:
  added base types