#17 fixed: string values replaced by enum pattern