Update to use Locals from fcomposite