Use correct entity for instantiation