Entity; fix previous commit missing the id (one extra undo whoops)