Added Parameter Parsing and Validation