Code improvements for FDS scenarios