Fix usage xml definition -- introducing blocks