This is what the API looks like now ..