Replaced string parameters with enum constants