Added support for remaining CF merge