Updated structure for clarity