Object Ids instead of strings
Merge branch 'Stack-fix'

* Stack-fix:
  Object Ids instead of strings