Add support for else in if