Towards the new API