Use base class for editing. Added removing.