Add optional parameters
Added Benchmarks scenario directory (work in progress)