Added defines for case conditionals