[DF-185] Updated scheme