Adapted to chenges in diamond
Native field used for optimization