Adapt to the new naming and add small farmref