Add native support