Add if/else support