Add FunctorUsage / BifunctorUsage