Changed "Entity" to be something more concrete