More work on the new Compendium