This will be simplified with the new api changes, right?