replaced string parameters by enum parameters where possible