Added custom cases option