Updates to FS engines