Change API to the old format (based on callbacks)