RelVal: applied new Enums where appropriate