updated structure for units