Modified entity tables