Updated class headers