Added class param to attribute tables