Helper class (Id) added
Merge branch 'feature-id-refactor' into develop