Switch to XML properties
Fixed encoding