Add unless & case conditionals