Comply to new api.