added Definition and Word classes