Added preliminary FSR support