Code structure updates