Update to singleton for edit view