Made the Entity parameterized.