Major changes on Helm package