Make entity source forward-compatible