Refactors YAML entities ids.
Fixes Collection submit and update methods.
Merge pull request #55 from mbmihura/YAML-Id-Refactor

Yaml id refactor