fixed Entity Models