Added html/xml support