Add entity utilities