Adding the -fr fields where needed