Added support for the if-then-else-if construct