Added some editing functionality