Added some enhancements and handle the sppassword