blueskythlikesclouds Improve compendium support