Added basic noun support