One more change, use iOS types