Add case/when/else support