added noun support