Adding backward compatibility for other orchard versions