Use err as error name
Remove unneeded fields
Add NewEntityById