Fixed entity context