Changed to updated structure
Changed structure