Modified xml based on discussion happenned in ARB meetings.