UPDATE PR comment. User fields instead of reuse constants