Fix order in wrong actions
Add xml support