Updated to include basic noun phrases