Changes and fix in structure