Complete rewrite
Include CAF manifest with additional changes