MODE-1820: Edit functions