Use new API
Update examples with new API