Update API to reflect github and offline discussion