Added service enumeration functions and argparse flag