Change to the new Peggy API