In a follow PR lets make this hook_entity_*()