More intelligent logic for loading optional includes