Added a few CFG utility functions