More messing with entities.