Make Some update for Main method