Update to handle input with no add-on