added various classes of noun as well