Refactored
Refactored argument processing
Removed deprecated parameters
filename refactoring