experimental change to entry api