Change to support xml files