Changed class structures.