Added OptinalStringUnwrapper for handling of empty strings