Add command line options and module interfacing