Added new options and tool module too simplify command line options and
tool implementations