Re-mapped entites, thanks to @vanessarossi