Changed something with xml structure