Moved over to different Credentials format as well as refactoring CommandExecutor