1) Minor changes
2)Added xmlbeans support