Updated client Main implementations so we can invoke them from bootstrap utilitiy.