Change applicaiton to use create_or_update for simplicity