Updated class specifications