Updated to work with compendium