Add $with_str flag

Change-Id: I711ff20a0c9e766c30f93bc22712023509762fd0