New classes to put all ESD contents on branches