Added editing support!