Next iteration of a more generic API.