Minor bugfix parsing input args
Minor changes to clean the Modules handle API