Updated Named Entity stuff