Add early support for CFE mapping