Updated API draft