Initial update to the new API