other changes associated with refactoring

* fix addElement...
* add properties for map elements

Change-Id: I67acdf96951dbc45b97329ad728b0c1d1d7fac09