Added enabled by CFG support