Refactor to use AcceptString where possible