[DIC] Better handling of enableable configurations