Refatoring Cli. Accepting other credentials.