updated signature with subclass
Merge branch 'develop' into feature/mongodb

* develop:
  updated signature with subclass