Porting to new Tangelo API.