Add support for cloudfronts3