Updated class descriptions and design