Updated class structures.