Tightened generics on Entity