More updates for capfiles