#REDCORE-145 Added country helper and field