* Update builtin struct to new schema