Better message
Simplifiy (Type)EntityImpl