Reworking the return type for EntityCore, going to replace the int with an Id class (id, name, core).