Some more CFGs and the framework has been modified a bit.