Added more functionality, simplified credentials, fewer prompts