Make entities return IDs