CM Shell: Changed authentication and added options.