Added IRIS development option
Use folder tags everywhere