[PATCH 2/7] Add editor functions