Updated extended types for new lib api