Using new entry API