Updated data builders to use new API