better class based definitions and noun list added