Added CF11 Support