Added disable functionality also for xml