Compendium improvements