Sushma, D3 | Added classes to support automation