Better consistency gestion