Creator and Editor updates