Changed CFG from static class to normal class