Add groundwork for commonplace update