Updated parser to support string key for dict