Add maps syntax support

Change-Id: I7a01d3f541e7601da62763fe6860a4f4c49444c5
2 files changed