[TASK] Readd command line parameter handling