Before Entity unifying