Added another model file and made sure named entities are unique