Defined some new classes for editing