converted to dict structure: #MSG-227 fixed