Updates for cider and company mode