Added helm and company mode