Add FR support