More Capfile changes