MM upgrade. Adding current working dir option.