Added if-else support