Updated FDS and SCD system plugins