added more classes for editing