functional class and xml changes