Upgrade to functional@0.2