Update iOS code as well