Cast just to Map

Change-Id: I31ada03a9bf45d7222210231ff2e67394a621dcb