Fixes and changes for enabling adding properties.
Removed Id getter, as it is shouldn't be used!
added a method.
Merge branch 'dev'