Staged: Building on the new API