Updated argument parsing - added support to check for modules