Feanil/xml updates