Added support for else blocks