Added class headers