Fix Entity hydratation