Refactor cdh version paramater