[ATV-102] More changes