Updating cores to use Fin.