Handling CLI parameters and propeties file format changed
Parameter handling fixed