Added hard if-else wrapper