Module improvement
Use CLI for options parsing