Add method for returning a dict

Change-Id: I7ae2cdc3ca3fee84f51817a7f021e7efe76ba78c